Refreshing patches.

diff --git a/debian/patches/gpsbabelfe-name b/debian/patches/gpsbabelfe-name
index 2df9c7c381475bf0bc5ad0d274cc4ef0ed296273..d23c4614cb1f5c6ed1384011be7dea798d377556 100644 (file)
--- a/debian/patches/gpsbabelfe-name
+++ b/debian/patches/gpsbabelfe-name
@@ -1,6 +1,6 @@
 Rename gpsbabelfe binary.
---- a/gpsbabel/gui/app.pro
-+++ b/gpsbabel/gui/app.pro
+--- a/gui/app.pro
++++ b/gui/app.pro
 @@ -36,7 +36,7 @@ win32 {
    TARGET=GPSBabelFE
    QMAKE_LFLAGS_RELEASE += -static-libgcc

diff --git a/debian/patches/gpsbabelfe_disable_version_check b/debian/patches/gpsbabelfe_disable_version_check
index 212cab1762660e11a1f2d06313baf02bd4ae217c..c1a94d4d3344ef8cab217f734172624110b4a824 100644 (file)
--- a/debian/patches/gpsbabelfe_disable_version_check
+++ b/debian/patches/gpsbabelfe_disable_version_check
@@ -1,7 +1,7 @@
 Disable version mismatch check.
 
---- a/gpsbabel/gui/preferences.ui
-+++ b/gpsbabel/gui/preferences.ui
+--- a/gui/preferences.ui
++++ b/gui/preferences.ui
 @@ -53,13 +53,6 @@
            </property>
           </widget>
@@ -16,8 +16,8 @@ Disable version mismatch check.
         </layout>
        </widget>
       </widget>
---- a/gpsbabel/gui/preferences.cc
-+++ b/gpsbabel/gui/preferences.cc
+--- a/gui/preferences.cc
++++ b/gui/preferences.cc
 @@ -41,7 +41,6 @@ Preferences::Preferences(QWidget* parent
  
    ui_.startupCheck->setChecked(babelData_.startupVersionCheck_);
@@ -34,8 +34,8 @@ Disable version mismatch check.
    accept();
  }
  
---- a/gpsbabel/gui/babeldata.h
-+++ b/gpsbabel/gui/babeldata.h
+--- a/gui/babeldata.h
++++ b/gui/babeldata.h
 @@ -66,7 +66,7 @@ public:
      startupVersionCheck_(true),
      reportStatistics_(true),

diff --git a/debian/patches/gpsbabelfe_do-not-check-for-newer-version b/debian/patches/gpsbabelfe_do-not-check-for-newer-version
index dd7db2a632060baf0abb62916ee1feee15100099..f453bf125ff9b4135146cfd16bef0f71529e6510 100644 (file)
--- a/debian/patches/gpsbabelfe_do-not-check-for-newer-version
+++ b/debian/patches/gpsbabelfe_do-not-check-for-newer-version
@@ -1,7 +1,7 @@
 Disable check for newer versions on start.
 
---- a/gpsbabel/gui/preferences.ui
-+++ b/gpsbabel/gui/preferences.ui
+--- a/gui/preferences.ui
++++ b/gui/preferences.ui
 @@ -40,13 +40,6 @@
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_4">
@@ -16,8 +16,8 @@ Disable check for newer versions on start.
           <widget class="QCheckBox" name="reportStatisticsCheck">
            <property name="text">
             <string>Anonymously report usage data.</string>
---- a/gpsbabel/gui/preferences.cc
-+++ b/gpsbabel/gui/preferences.cc
+--- a/gui/preferences.cc
++++ b/gui/preferences.cc
 @@ -39,7 +39,6 @@ Preferences::Preferences(QWidget* parent
  {
    ui_.setupUi(this);
@@ -34,8 +34,8 @@ Disable check for newer versions on start.
    babelData_.reportStatistics_ = ui_.reportStatisticsCheck->isChecked();
    accept();
  }
---- a/gpsbabel/gui/babeldata.h
-+++ b/gpsbabel/gui/babeldata.h
+--- a/gui/babeldata.h
++++ b/gui/babeldata.h
 @@ -63,7 +63,7 @@ public:
      upgradeErrors_(0),
      upgradeOffers_(0),
@@ -45,8 +45,8 @@ Disable check for newer versions on start.
      reportStatistics_(false),
      allowBetaUpgrades_(false),
      ignoreVersionMismatch_(true),
---- a/gpsbabel/gui/mainwinui.ui
-+++ b/gpsbabel/gui/mainwinui.ui
+--- a/gui/mainwinui.ui
++++ b/gui/mainwinui.ui
 @@ -637,7 +637,6 @@
      <addaction name="actionHelp"/>
      <addaction name="separator"/>
@@ -67,8 +67,8 @@ Disable check for newer versions on start.
    <action name="actionVisit_Website">
     <property name="text">
      <string>Visit Website...</string>
---- a/gpsbabel/gui/mainwindow.cc
-+++ b/gpsbabel/gui/mainwindow.cc
+--- a/gui/mainwindow.cc
++++ b/gui/mainwindow.cc
 @@ -147,7 +147,6 @@ MainWindow::MainWindow(QWidget* parent):
    connect(ui_.actionAbout, SIGNAL(triggered()), this, SLOT(aboutActionX()));
    connect(ui_.actionVisit_Website, SIGNAL(triggered()), this, SLOT(visitWebsiteActionX()));

diff --git a/debian/patches/gpsbabelfe_opt-in-for-usage-data-reporting b/debian/patches/gpsbabelfe_opt-in-for-usage-data-reporting
index 7df0d4222d8d48cb167cd5a01aa0acb4222f2f35..d161aaed966101671a1b93e7b6bfa3a36fe1df35 100644 (file)
--- a/debian/patches/gpsbabelfe_opt-in-for-usage-data-reporting
+++ b/debian/patches/gpsbabelfe_opt-in-for-usage-data-reporting
@@ -1,6 +1,6 @@
 Make statistics reporting an opt-in option.
---- a/gpsbabel/gui/babeldata.h
-+++ b/gpsbabel/gui/babeldata.h
+--- a/gui/babeldata.h
++++ b/gui/babeldata.h
 @@ -64,7 +64,7 @@ public:
      upgradeOffers_(0),
      runCount_(0),

diff --git a/debian/patches/htmldoc-location b/debian/patches/htmldoc-location
index 7588852325638257d2b4c8121c24247456e41482..bf2d596c92d916d8ff2bc9cb6c7ff0bed109c328 100644 (file)
--- a/debian/patches/htmldoc-location
+++ b/debian/patches/htmldoc-location
@@ -1,20 +1,20 @@
---- a/gpsbabel/gbversion.h.in
-+++ b/gpsbabel/gbversion.h.in
+--- a/gbversion.h.in
++++ b/gbversion.h.in
 @@ -5,4 +5,4 @@
   * Isn't simplification via automation grand?
   */
  #define VERSION "@GBMAJOR@.@GBMINOR@.@GBMICRO@@PACKAGE_RELEASE@"
 -#define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-@DOCVERSION@"
 +#define WEB_DOC_DIR "file:///usr/share/doc/gpsbabel/htmldoc/index.html"
---- a/gpsbabel/gui/help/gpsbabel.html
-+++ b/gpsbabel/gui/help/gpsbabel.html
+--- a/gui/help/gpsbabel.html
++++ b/gui/help/gpsbabel.html
 @@ -1,3 +1,3 @@
  <p>This is the local help.  It currently isn't very helpful.</p>
 -<p>The <a href="http://www.gpsbabel.org/htmldoc-development"> online help 
 +<p>The <a href="file:///usr/share/doc/gpsbabel/htmldoc/index.html"> online help 
     is mo betta.</p>
---- a/gpsbabel/xmldoc/gpsbabel_man.xml
-+++ b/gpsbabel/xmldoc/gpsbabel_man.xml
+--- a/xmldoc/gpsbabel_man.xml
++++ b/xmldoc/gpsbabel_man.xml
 @@ -79,7 +79,7 @@ or as the backend for other tools. </par
        <listitem> <para>Display help that is more exhaustive than this page.  If <replaceable>format</replaceable> is given, provide help for only that format.</para> </listitem>
  </varlistentry>